merge trunk
authorK. Handa <handa@gnu.org>
Mon, 17 Jun 2013 14:45:39 +0000 (23:45 +0900)
committerK. Handa <handa@gnu.org>
Mon, 17 Jun 2013 14:45:39 +0000 (23:45 +0900)

Trivial merge